Merge git://git.denx.de/u-boot-dm
authorTom Rini <[email protected]>
Mon, 31 Aug 2015 15:43:47 +0000 (11:43 -0400)
committerTom Rini <[email protected]>
Mon, 31 Aug 2015 15:43:47 +0000 (11:43 -0400)

Trivial merge